Fix Mark Simon's feedbacks
Style forms