cleaned up UI
cleanup time
changing stuff up
Merge pull request #1 from hugobomber/huge/lab6

Huge/lab6