UI Tweaks

WrapPanel, Omg i love you so much! <3
Fixed merge bugs
Merge pull request #32 from alfeko/master

UI Update