fixed many layout issues, this should just about be "final" for the time being