code cleanup, ui skeleton