UI improvements and adding plan stuff