UI Tweaks

WrapPanel, Omg i love you so much! <3
Fixed merge bugs