Added Settings and modified design accordingly