Changes added, few enhancements, error handling
Merge pull request #16 from NIT-Warangal/LayoutChanges

Changes added, few enhancements, error handling