Minor tweaks to css and markup

changed the posistion of actions on the modal window
Merge branch 'master' of https://github.com/andwiik/toshimoshi

Conflicts:
	.idea/workspace.xml