Initial code to improve UI

Signed-off-by: Iktwo Sh <elmaildeliktwo@gmail.com>