Tweaking layout for better display