Working on bug fixes for site