fixing some merge bugs with spinner, pulling layout from app_bootstrap as much as possible