fuck tonne of changes to layout. much prettyier