Fixed margin issues, odd layouts