Misc Design Updates