adding unlocks and fixing some layout issues