changes due to Nick's UI design