diff --git a/MKInfoBundle/MKInfoPanel.h b/MKInfoBundle/MKInfoPanel.h
index 7736db0..99bca8c 100644
--- a/MKInfoBundle/MKInfoPanel.h
+++ b/MKInfoBundle/MKInfoPanel.h
@@ -20,8 +20,7 @@
 #import <UIKit/UIKit.h>
 #define RGBA(r, g, b, a) [UIColor colorWithRed:r/255.0 green:g/255.0 blue:b/255.0 alpha:a]
 
-typedef enum MKInfoPanelType_
-{    
+typedef enum {    
     MKInfoPanelTypeInfo,
     MKInfoPanelTypeError
 } MKInfoPanelType;
@@ -33,15 +32,29 @@ typedef enum MKInfoPanelType_
     
     UIImageView *_thumbImage;
     UIImageView *_backgroundGradient;
+    
+    SEL _onTouched;
+    
+    id _delegate;
+    SEL _onFinished;
+    
+    MKInfoPanelType type_;
 }
 
 @property (nonatomic, assign) IBOutlet UILabel *titleLabel;
 @property (nonatomic, assign) IBOutlet UILabel *detailLabel;
 @property (nonatomic, assign) IBOutlet UIImageView *thumbImage;
 @property (nonatomic, assign) IBOutlet UIImageView *backgroundGradient;
+@property (nonatomic, assign) SEL onTouched;
+@property (nonatomic, assign) id delegate;
+@property (nonatomic, assign) SEL onFinished;
+
++ (MKInfoPanel *)showPanelInView:(UIView*)view type:(MKInfoPanelType)type title:(NSString *)title subtitle:(NSString *)subtitle;
++ (MKInfoPanel *)showPanelInView:(UIView*)view type:(MKInfoPanelType)type title:(NSString *)title subtitle:(NSString *)subtitle hideAfter:(NSTimeInterval)interval;
 
-+(void) showPanelInView:(UIView*) view type:(MKInfoPanelType) type title:(NSString*) title subtitle:(NSString*) subtitle hideAfter:(NSTimeInterval) interval;
++ (MKInfoPanel *)showPanelInWindow:(UIWindow*)window type:(MKInfoPanelType)type title:(NSString *)title subtitle:(NSString *)subtitle;
++ (MKInfoPanel *)showPanelInWindow:(UIWindow*)window type:(MKInfoPanelType)type title:(NSString *)title subtitle:(NSString *)subtitle hideAfter:(NSTimeInterval)interval;
 
-+(void) showPanelInWindow:(UIWindow*) window type:(MKInfoPanelType) type title:(NSString*) title subtitle:(NSString*) subtitle hideAfter:(NSTimeInterval) interval;
+- (void)hidePanel;
 
 @end
diff --git a/MKInfoBundle/MKInfoPanel.m b/MKInfoBundle/MKInfoPanel.m
index 69e946a..f280b92 100644
--- a/MKInfoBundle/MKInfoPanel.m
+++ b/MKInfoBundle/MKInfoPanel.m
@@ -21,126 +21,180 @@
 #import <QuartzCore/QuartzCore.h>
 
 // Private Methods
-// this should be added before implementation block 
 
-@interface MKInfoPanel (PrivateMethods)
+@interface MKInfoPanel ()
+
 @property (nonatomic, assign) MKInfoPanelType type;
+
 + (MKInfoPanel*) infoPanel;
+
+- (void)setup;
+
 @end
 
 
 @implementation MKInfoPanel
+
 @synthesize titleLabel = _titleLabel;
 @synthesize detailLabel = _detailLabel;
 @synthesize thumbImage = _thumbImage;
 @synthesize backgroundGradient = _backgroundGradient;
+@synthesize onTouched = _onTouched;
+@synthesize delegate = _delegate;
+@synthesize onFinished = _onFinished;
+@synthesize type = type_;
 
-- (id)initWithFrame:(CGRect)frame
-{
+
+////////////////////////////////////////////////////////////////////////
+#pragma mark -
+#pragma mark Lifecycle
+////////////////////////////////////////////////////////////////////////
+
+- (id)initWithFrame:(CGRect)frame {
     self = [super initWithFrame:frame];
     if (self) {
-        // Initialization code
+        [self setup];
+    }
+    return self;
+}
+
+- (id)initWithCoder:(NSCoder *)aDecoder {
+    self = [super initWithCoder:aDecoder];
+    if (self) {
+        [self setup];
     }
     return self;
 }
 
--(void) setType:(MKInfoPanelType)type
-{
-    if(type == MKInfoPanelTypeError)
-    {
+- (void)dealloc {
+    [_delegate performSelector:_onFinished];
+    
+    [super dealloc];
+}
+
+////////////////////////////////////////////////////////////////////////
+#pragma mark -
+#pragma mark Setter/Getter
+////////////////////////////////////////////////////////////////////////
+
+-(void)setType:(MKInfoPanelType)type {
+    if(type == MKInfoPanelTypeError) {
         self.backgroundGradient.image = [[UIImage imageNamed:@"Red"] stretchableImageWithLeftCapWidth:1 topCapHeight:5];
         self.titleLabel.font = [UIFont boldSystemFontOfSize:14];
         self.detailLabel.font = [UIFont fontWithName:@"Helvetica Neue" 
                                                 size:14];
         self.thumbImage.image = [UIImage imageNamed:@"Warning"];
-        self.detailLabel.textColor = RGBA(255, 140, 140, 0.6);
-
+        self.detailLabel.textColor = [UIColor colorWithRed:1.f green:0.651f blue:0.651f alpha:1.f];
     }
-    else if(type == MKInfoPanelTypeInfo)
-    {
+    
+    else if(type == MKInfoPanelTypeInfo) {
         self.backgroundGradient.image = [[UIImage imageNamed:@"Blue"] stretchableImageWithLeftCapWidth:1 topCapHeight:5];
         self.titleLabel.font = [UIFont boldSystemFontOfSize:15];
         self.thumbImage.image = [UIImage imageNamed:@"Tick"];   
         self.detailLabel.textColor = RGBA(210, 210, 235, 1.0);
     }
-        
 }
-+(MKInfoPanel*) infoPanel
-{
-    MKInfoPanel *panel =  (MKInfoPanel*) [[[UINib nibWithNibName:@"MKInfoPanel" bundle:nil] 
-                                           instantiateWithOwner:self options:nil] objectAtIndex:0];
 
-    
-    CATransition *transition = [CATransition animation];
-	transition.duration = 0.25;
-	transition.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut];
-	transition.type = kCATransitionPush;	
-	transition.subtype = kCATransitionFromBottom;
-	[panel.layer addAnimation:transition forKey:nil];
-    
-    return panel;
+////////////////////////////////////////////////////////////////////////
+#pragma mark -
+#pragma mark Show/Hide
+////////////////////////////////////////////////////////////////////////
+
++ (MKInfoPanel *)showPanelInView:(UIView *)view type:(MKInfoPanelType)type title:(NSString *)title subtitle:(NSString *)subtitle {
+    return [self showPanelInView:view type:type title:title subtitle:subtitle hideAfter:-1];
 }
 
-+(void) showPanelInView:(UIView*) view type:(MKInfoPanelType) type title:(NSString*) title subtitle:(NSString*) subtitle hideAfter:(NSTimeInterval) interval
-{
++(MKInfoPanel *)showPanelInView:(UIView *)view type:(MKInfoPanelType)type title:(NSString *)title subtitle:(NSString *)subtitle hideAfter:(NSTimeInterval)interval {    
     MKInfoPanel *panel = [MKInfoPanel infoPanel];
-    [panel setType:type];
+    CGFloat panelHeight = 50;   // panel height when no subtitle set
+    
+    panel.type = type;
     panel.titleLabel.text = title;
-    if(subtitle)
-    {
+    
+    if(subtitle) {
         panel.detailLabel.text = subtitle;
-    }
-    else
-    {
+        [panel.detailLabel sizeToFit];
+        
+        panelHeight = MAX(CGRectGetMaxY(panel.thumbImage.frame), CGRectGetMaxY(panel.detailLabel.frame));
+        panelHeight += 10.f;    // padding at bottom
+    } else {
         panel.detailLabel.hidden = YES;
-        panel.frame = CGRectMake(0, 0, 320, 50);
         panel.thumbImage.frame = CGRectMake(15, 5, 35, 35);
         panel.titleLabel.frame = CGRectMake(57, 12, 240, 21);
-        
     }
     
+    // update frame of panel
+    panel.frame = CGRectMake(0, 0, view.bounds.size.width, panelHeight);
     [view addSubview:panel];
-    [panel performSelector:@selector(hidePanel) withObject:view afterDelay:interval];
+    
+    if (interval > 0) {
+        [panel performSelector:@selector(hidePanel) withObject:view afterDelay:interval]; 
+    }
+    
+    return panel;
 }
 
-+(void) showPanelInWindow:(UIWindow*) window type:(MKInfoPanelType) type title:(NSString*) title subtitle:(NSString*) subtitle hideAfter:(NSTimeInterval) interval
-{
-    MKInfoPanel *panel = [MKInfoPanel infoPanel];
-    [panel setType:type];
-    panel.titleLabel.text = title;
-    if(subtitle)
-    {
-        panel.detailLabel.text = subtitle;
-    }
-    else
-    {
-        panel.detailLabel.hidden = YES;
-        panel.frame = CGRectMake(0, 20, 320, 50);
-        panel.thumbImage.frame = CGRectMake(15, 5, 35, 35);
-        panel.titleLabel.frame = CGRectMake(57, 12, 240, 21);
-        
++ (MKInfoPanel *)showPanelInWindow:(UIWindow *)window type:(MKInfoPanelType)type title:(NSString *)title subtitle:(NSString *)subtitle {
+    return [self showPanelInWindow:window type:type title:title subtitle:subtitle hideAfter:-1];
+}
+
++(MKInfoPanel *)showPanelInWindow:(UIWindow *)window type:(MKInfoPanelType)type title:(NSString *)title subtitle:(NSString *)subtitle hideAfter:(NSTimeInterval)interval {
+    MKInfoPanel *panel = [self showPanelInView:window type:type title:title subtitle:subtitle hideAfter:interval];
+    
+    if (![UIApplication sharedApplication].statusBarHidden) {
+        CGRect frame = panel.frame;
+        frame.origin.y += [UIApplication sharedApplication].statusBarFrame.size.height;
+        panel.frame = frame;
     }
     
-    [window addSubview:panel];
-    [panel performSelector:@selector(hidePanel) withObject:window afterDelay:interval];
+    return panel;
 }
 
--(void) hidePanel
-{
+-(void)hidePanel {
+    [NSObject cancelPreviousPerformRequestsWithTarget:self];
+    
     CATransition *transition = [CATransition animation];
 	transition.duration = 0.25;
 	transition.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut];
 	transition.type = kCATransitionPush;	
 	transition.subtype = kCATransitionFromTop;
 	[self.layer addAnimation:transition forKey:nil];
-    self.frame = CGRectMake(0, -self.frame.size.height, 320, self.frame.size.height); 
+    self.frame = CGRectMake(0, -self.frame.size.height, self.frame.size.width, self.frame.size.height); 
     
     [self performSelector:@selector(removeFromSuperview) withObject:nil afterDelay:0.25];
 }
 
-- (void)dealloc
-{
-    [super dealloc];
+////////////////////////////////////////////////////////////////////////
+#pragma mark -
+#pragma mark Touch Recognition
+////////////////////////////////////////////////////////////////////////
+
+-(void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event {
+    [self performSelector:_onTouched];
+}
+
+////////////////////////////////////////////////////////////////////////
+#pragma mark -
+#pragma mark Private
+////////////////////////////////////////////////////////////////////////
+
++(MKInfoPanel *)infoPanel {
+    MKInfoPanel *panel =  (MKInfoPanel*) [[[UINib nibWithNibName:@"MKInfoPanel" bundle:nil] 
+                                           instantiateWithOwner:self options:nil] objectAtIndex:0];
+    
+    CATransition *transition = [CATransition animation];
+	transition.duration = 0.25;
+	transition.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut];
+	transition.type = kCATransitionPush;	
+	transition.subtype = kCATransitionFromBottom;
+	[panel.layer addAnimation:transition forKey:nil];
+    
+    return panel;
+}
+
+- (void)setup {
+    self.onTouched = @selector(hidePanel);
+    self.autoresizingMask = UIViewAutoresizingFlexibleWidth;
 }
 
 @end
diff --git a/MKInfoBundle/MKInfoPanel.xib b/MKInfoBundle/MKInfoPanel.xib
index d1e6c9d..14f4094 100644
--- a/MKInfoBundle/MKInfoPanel.xib
+++ b/MKInfoBundle/MKInfoPanel.xib
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
 	<data>
-		<int key="IBDocument.SystemTarget">1056</int>
+		<int key="IBDocument.SystemTarget">1280</int>
 		<string key="IBDocument.SystemVersion">10J869</string>
-		<string key="IBDocument.InterfaceBuilderVersion">1306</string>
+		<string key="IBDocument.InterfaceBuilderVersion">1864</string>
 		<string key="IBDocument.AppKitVersion">1038.35</string>
 		<string key="IBDocument.HIToolboxVersion">461.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			<string key="NS.object.0">301</string>
+			<string key="NS.object.0">865</string>
 		</object>
 		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -22,11 +22,8 @@
 			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 		</object>
 		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSArray" key="dict.sortedKeys" id="0">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-			</object>
-			<reference key="dict.values" ref="0"/>
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
 		</object>
 		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -46,7 +43,7 @@
 					<object class="IBUIImageView" id="167006686">
 						<reference key="NSNextResponder" ref="191373211"/>
 						<int key="NSvFlags">274</int>
-						<string key="NSFrameSize">{320, 70}</string>
+						<string key="NSFrameSize">{320, 66}</string>
 						<reference key="NSSuperview" ref="191373211"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="670261700"/>
@@ -60,7 +57,7 @@
 					<object class="IBUILabel" id="446193903">
 						<reference key="NSNextResponder" ref="191373211"/>
 						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{72, 5}, {240, 21}}</string>
+						<string key="NSFrame">{{57, 4}, {240, 21}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="931177448"/>
@@ -70,11 +67,6 @@
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						<string key="IBUIText">Network Failure</string>
-						<object class="NSFont" key="IBUIFont">
-							<string key="NSName">Helvetica-Bold</string>
-							<double key="NSSize">15</double>
-							<int key="NSfFlags">16</int>
-						</object>
 						<object class="NSColor" key="IBUITextColor">
 							<int key="NSColorSpace">3</int>
 							<bytes key="NSWhite">MQA</bytes>
@@ -86,13 +78,25 @@
 						</object>
 						<int key="IBUIBaselineAdjustment">1</int>
 						<float key="IBUIMinimumFontSize">10</float>
+						<object class="IBUIFontDescription" key="IBUIFontDescription">
+							<string key="name">Helvetica-Bold</string>
+							<string key="family">Helvetica</string>
+							<int key="traits">2</int>
+							<double key="pointSize">15</double>
+						</object>
+						<object class="NSFont" key="IBUIFont">
+							<string key="NSName">Helvetica-Bold</string>
+							<double key="NSSize">15</double>
+							<int key="NSfFlags">16</int>
+						</object>
 					</object>
 					<object class="IBUILabel" id="931177448">
 						<reference key="NSNextResponder" ref="191373211"/>
 						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{72, 22}, {240, 43}}</string>
+						<string key="NSFrame">{{57, 25}, {251, 32}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
 						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView"/>
 						<reference key="IBUIBackgroundColor" ref="850539178"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClipsSubviews">YES</bool>
@@ -100,11 +104,6 @@
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						<string key="IBUIText">Check your internet connection and try again later</string>
-						<object class="NSFont" key="IBUIFont">
-							<string key="NSName">HelveticaNeue</string>
-							<double key="NSSize">14</double>
-							<int key="NSfFlags">16</int>
-						</object>
 						<object class="NSColor" key="IBUITextColor">
 							<int key="NSColorSpace">1</int>
 							<bytes key="NSRGB">MSAwLjU0OTAxOTYwNzggMC41NDkwMTk2MDc4IDAuNgA</bytes>
@@ -113,12 +112,23 @@
 						<int key="IBUIBaselineAdjustment">1</int>
 						<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
 						<float key="IBUIMinimumFontSize">10</float>
-						<int key="IBUINumberOfLines">2</int>
+						<int key="IBUINumberOfLines">0</int>
+						<object class="IBUIFontDescription" key="IBUIFontDescription">
+							<string key="name">HelveticaNeue</string>
+							<string key="family">Helvetica Neue</string>
+							<int key="traits">0</int>
+							<double key="pointSize">14</double>
+						</object>
+						<object class="NSFont" key="IBUIFont">
+							<string key="NSName">HelveticaNeue-Medium</string>
+							<double key="NSSize">14</double>
+							<int key="NSfFlags">16</int>
+						</object>
 					</object>
 					<object class="IBUIImageView" id="670261700">
 						<reference key="NSNextResponder" ref="191373211"/>
 						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{15, 10}, {50, 50}}</string>
+						<string key="NSFrame">{{12, 8}, {37, 34}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="446193903"/>
@@ -126,7 +136,7 @@
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 					</object>
 				</object>
-				<string key="NSFrameSize">{320, 70}</string>
+				<string key="NSFrameSize">{320, 66}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="167006686"/>
@@ -179,7 +189,9 @@
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<object class="IBObjectRecord">
 						<int key="objectID">0</int>
-						<reference key="object" ref="0"/>
+						<object class="NSArray" key="object" id="0">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+						</object>
 						<reference key="children" ref="1000"/>
 						<nil key="parent"/>
 					</object>
@@ -189,9 +201,9 @@
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<reference ref="446193903"/>
-							<reference ref="931177448"/>
 							<reference ref="670261700"/>
 							<reference ref="167006686"/>
+							<reference ref="931177448"/>
 						</object>
 						<reference key="parent" ref="0"/>
 					</object>
@@ -232,9 +244,10 @@
 				<bool key="EncodedWithXMLCoder">YES</bool>
 				<object class="NSArray" key="dict.sortedKeys">
 					<bool key="EncodedWithXMLCoder">YES</bool>
+					<string>-1.IBPluginDependency</string>
 					<string>-2.CustomClassName</string>
+					<string>-2.IBPluginDependency</string>
 					<string>1.CustomClassName</string>
-					<string>1.IBEditorWindowLastContentRect</string>
 					<string>1.IBPluginDependency</string>
 					<string>3.IBPluginDependency</string>
 					<string>4.IBPluginDependency</string>
@@ -243,9 +256,10 @@
 				</object>
 				<object class="NSMutableArray" key="dict.values">
 					<bool key="EncodedWithXMLCoder">YES</bool>
+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>UIResponder</string>
+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>MKInfoPanel</string>
-					<string>{{354, 412}, {320, 480}}</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -334,6 +348,6 @@
 		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<string key="IBCocoaTouchPluginVersion">301</string>
+		<string key="IBCocoaTouchPluginVersion">865</string>
 	</data>
 </archive>
diff --git a/MKInfoBundle/Tick.png b/MKInfoBundle/Tick.png
index 1fcb2ca..1068a8b 100644
Binary files a/MKInfoBundle/Tick.png and b/MKInfoBundle/Tick.png differ
diff --git a/MKInfoBundle/Tick@2x.png b/MKInfoBundle/Tick@2x.png
index fe310cc..5a84f90 100644
Binary files a/MKInfoBundle/Tick@2x.png and b/MKInfoBundle/Tick@2x.png differ
diff --git a/MKInfoBundle/Warning.png b/MKInfoBundle/Warning.png
index 732c634..bbeebd0 100644
Binary files a/MKInfoBundle/Warning.png and b/MKInfoBundle/Warning.png differ
diff --git a/MKInfoBundle/Warning@2x.png b/MKInfoBundle/Warning@2x.png
index 31feca7..fe9710a 100644
Binary files a/MKInfoBundle/Warning@2x.png and b/MKInfoBundle/Warning@2x.png differ