merge
make tabbing work
make bootstrap and codepicker play nice