added settings basic layout, timer fix