Improved layout
More fixes for #88
More fixes for #88