reorganized some stuff - basic styling