bug fixes and color sheme changes