Fixed Margin Issues, removed fixed some tag/spacing issues