added more html and separate for ease