Improve layout / Fix task option popup
Add test specs