Temporary fix until better layout is implemented.