Minor styles fix
Add selection widget