Refactor css/html a bit to make life easier on Greg