Fixed ordering bugs and made some changes to clicking.