new layout and stuff

\o/