Ghetto merged UI elements Merged
Fixed merge issues