updated button and input styling
fixed merge conflictsin footer