Updated to render properly on Android