layouts switched.

time to refactor its getting a bit messy.