work on admin - in progress
changes to layout design and tables in admin
solved conflicts
finished admin redesign
finished admin redesign