Layout rehaul..a few kinks to fix tho