Beta Up #12

Now working on flat design