UI changes + configuring + modified testing suite