#9 Changed design

Had some bugs with UI