Done updates
Some layout tweaks