Re-arranged screen layout