Some UI general work 'n stuff

Signed-off-by: marksomnian <totallyupdown@gmail.com>
Fix'd

Signed-off-by: marksomnian <totallyupdown@gmail.com>
Merge branch 'master' of https://github.com/marksomnian/echode.git

Conflicts:
	.gitignore