Layout
Clean up abstraction data issue and some layout issues.