More UI changes. Removed Foundation.