Added scissor testing

More UI tweaks