Added more current layouts; Removed unused layout