Added the proper user module, restructured the main template, and moved around the options to be a little more clear when using them a nested level.