Added some feedback to user
Fixed the layot a bit