Styling issues and add TODO in Interfacehandler