Better structure and fixed css