hella front end changes
fixed merge conflicts. problem with uploading.