Fixing up some errors and layouts