Updated design

Now all should look pretty and useless comments are delted