WIP
fix merge conflicts
fixed button style and styled mentor form