layout changes and new feature