Changed style and fixed some issues