Changed a lot of positioning of items