Adding support for user interactions. Layout fixes