Removed old armor code and cleaned up layout