Fixed lines for top and bottom + Some Cleanup