DAR-524 | Fix layout and css