UI changes + new functionality