Main View design improvements