Done a bit work on UI