File upload button added + some unnecessary ids removed