fixed stlyling and fixed spaces issue