Update layout and fix some stuff