Some more robust css and nicer ui integration