fix map and cleanup styles