WIP. DO NOT MERGE IT. Need to save the changes in order to do bugfixing on other branches.
new bucketnav design