new layout; removed descriptions; cleaned up