Beefed up

Added in more reset stuff, re-positioned elements and added comments.