Fixed drawing bug and replaced buttons with native