Add improvements on responsivity and layout