[GUI - look and feel] [refactor ..]