changed layout sorry for merge conflicts :(
swagg
may have messed stuff up trying to fix merge conflict here