Fix directional issues and add own painting