Small layout fixes to the new disease controls (Related to #38).
Merge remote-tracking branch 'origin/vladi' into develop

Conflicts:
	src/main/java/view/Display.java
Resolved merge conflict