Added Tags, formatt layout nicer