Started to add more extended stuff and panel items