alotta changes

design as well as functionality