Refactored top menu block
Re-themed and placed search block
Re-themed Main Menu