Updated the General Layout and Look