Fixed bunch of issues regarding layouts