Fixed AutoLayout Issues and updated UI