encapsulate more stuff
divide lists vertically
more encapsulation
reset popup