General Stuff

Updated design, etc