improve layout a bit + add navbar