Added some styling, fixed some defects.