Eric Lima
fix layout issues