Final commits here
Fixed UI-glitch