fixes for navbar commit ADD fail

Squashed commit of the following:

commit a82475bf1b16e822804911beb80639b855957c40
Author: nuclearmistake <nuclearmistake@gmail.com>
Date:   Fri Jan 18 20:08:26 2013 -0500

    fixes

    Change-Id: I48483b0d9af4efb29c08e4b6451bd89295bdd431

commit 2b394adcb2207e3b480ba9897a6e223dc3b0513b
Merge: a216af6 43443a7
Author: nuclearmistake <nuclearmistake@gmail.com>
Date:   Fri Jan 18 19:56:43 2013 -0500

    Merge remote-tracking branch 'vanir/jb42' into fuckk

    Change-Id: I3ee7430353182fda4fd19898f26567d0daf4e3d1

commit a216af6dddcf097cf77b845e24bb961dfdb71d36
Author: nuclearmistake <nuclearmistake@gmail.com>
Date:   Fri Jan 18 19:56:21 2013 -0500

    Fix a stoopid

    Change-Id: Ia28a9d2859f5b1323ed9ce18efde27d547847fd8

Change-Id: I71d379b8a2d7a6ae5b23fad75ded66b6a0055441