fix syling and compatibility issues, minor bugs