Fix implementation review.
Remove obsolete file.
Update layouts/styles.