fixes on alignment + formatting

fixed some nasty alignment issues + added some formatting options