Code revision + Responsive layout