beginning to buttonize various a tags, spacing padding, cleanup templates