Fixed the layout issues
added a remove line item
Removed old code