third commit: UI complete