Tons of changes

Started working on admin