Resolved Dupes error. Fixed UI bugs and made UI changes