modifying views a little bit
merging some new admin things