Added status control and improved navigation