Workin on all the styling issues