Improved formatting/design

Still lots more todo