Bug fix
Minor design changes