Fixed minor changes for sw600dp layout