Did all positioning of objects and some fixes