Some improvement for responsive layout