Updated forms and buttons code

Need to check in various browsers later