cleaning up some stuff
remove need for seperate layout
some styles + refactor on my last changes