Removed Linebreak

Doesn't add useless linebreak in empty textbox
Added some Bootstrap
Finish Failed Merge
Major UI improvements, bootstrap added.
clean up