Moved to a bootstrap based layout