Removed placeholder from feedback/
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Fixed UI, implemented primitive shift focus function
resolved merge conflict