Layout and styling fixes