Merge pull request #90 from krunalshahmo/master

Added functionality to settings page, deleted frame border and aligned top and left margins