Some refactoring has been made. Simple css has been added