Added code / Layout tweaks