Fixes on styling and behaviour