Small Tweaks and layout updates