Fixed #5 : enhanced UI of all forms