rearraged view, added css