Fixed android compatibility and added Display.