fixed form-bug and added some styles