bug fix for form + some new styling