Minor adjustments. TODO: Mouse input