Generic fixes

Fixed overall style and presentation