More changes and adding a custom statusline