Added presentation and fixed style issues