Some more design changes

Seriouly, I gotta put this in Dropbox :|