Added new styling and fixed form