removed unnescesary TODO tags
added AdminScreen and sub panes