Major refactoring of cluedo class and UI