fix display issues, nil bugs, layout