Some changes to layout, further code-cleanup
Added status