Final commit for the first page ommiting the border and select issues